From 11247302ade76cc40b28e01f500d0db7f26b72c4 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Thu, 1 Feb 2007 16:07:22 +0000 Subject: [PATCH] [XEN] Extend the range returned by KEXEC_RANGE_MA_XEN to cover the heap as well as code+data. This makes kdump work again after 13546:d86a96ca47a3 Also fix sizeof_note to correctly calculate the length of the name field. Signed-off-by: Ian Campbell --- xen/common/kexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/kexec.c b/xen/common/kexec.c index ca729d10c1..a9e85cad7f 100644 --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -141,7 +141,7 @@ static void setup_note(Elf_Note *n, const char *name, int type, int descsz) static int sizeof_note(const char *name, int descsz) { return (sizeof(Elf_Note) + - ELFNOTE_ALIGN(sizeof(name)) + + ELFNOTE_ALIGN(strlen(name)+1) + ELFNOTE_ALIGN(descsz)); } @@ -163,7 +163,7 @@ static int kexec_get(reserve)(xen_kexec_range_t *range) static int kexec_get(xen)(xen_kexec_range_t *range) { range->start = virt_to_maddr(_start); - range->size = (unsigned long)_end - (unsigned long)_start; + range->size = (unsigned long)xenheap_phys_end - (unsigned long)range->start; return 0; } -- 2.30.2